Conflict resolution fixup
authorAndreas Schwab <schwab@linux-m68k.org>
Wed, 9 Jun 2010 22:34:08 +0000 (00:34 +0200)
committerAndreas Schwab <schwab@linux-m68k.org>
Wed, 9 Jun 2010 22:34:08 +0000 (00:34 +0200)
commit4ae5aa08b5ac2f540e8a0e5c3d52ce35a9eb1738
tree1c003f472773031257da3568de2072af41444911
parentbfbd31badc6d1ed9a2d5e9e1b8ce3440b0838915
Conflict resolution fixup
lisp/ChangeLog
lisp/net/rcirc.el